Pass NULL as color state when capturing stage

NULL means the default color state of the stage will be used, which is
what happened before.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4090>

diff --git a/js/ui/layout.js b/js/ui/layout.js
index e68780d0e58067173ef0ee747ccb49f2a9138471..7b8af4726abda8b732699d5feaf6a34ca878fa67 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1408,7 +1408,7 @@ class ScreenTransition extends Clutter.Actor {
             height: global.screen_height,
         });
         const [, , , scale] = global.stage.get_capture_final_size(rect);
-        this.content = global.stage.paint_to_content(rect, scale, Clutter.PaintFlag.NO_CURSORS);
+        this.content = global.stage.paint_to_content(rect, scale, null, Clutter.PaintFlag.NO_CURSORS);
 
         this.opacity = 255;
         this.show();

diff --git a/src/shell-screenshot.c b/src/shell-screenshot.c
index d1ded8c0b9deb9e5390a8d0bae5fd3190821b0e8..facb6b53067b7f2c01387c0d0f105b0f62f343b4 100644 (file)
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@@ -340,6 +340,7 @@ do_grab_screenshot (ShellScreenshot     *screenshot,
                                       cairo_image_surface_get_data (image),
                                       cairo_image_surface_get_stride (image),
                                       COGL_PIXEL_FORMAT_CAIRO_ARGB32_COMPAT,
+                                      NULL,
                                       paint_flags,
                                       &error))
     {
@@ -492,6 +493,7 @@ grab_screenshot_content (ShellScreenshot *screenshot,
   screenshot->scale = scale;
 
   content = clutter_stage_paint_to_content (stage, &screenshot_rect, scale,
+                                            NULL,
                                             CLUTTER_PAINT_FLAG_NO_CURSORS,
                                             &error);
   if (!content)